Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Sep 2011 20:21:30 +0000 (13:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Sep 2011 20:21:30 +0000 (13:21 -0700)
commitc5853e72c4ceb1648ecbc21add75fb10263582b4
tree98936938a83ecbdcf55d7c50cd41851172646a80
parent184f5b12dc3b03e67cfd7ae4a03aef96b465c45f
parent9866b0fc6722da1f052d1ac3ea065bc01f61bb27
Merge from trunk.